Rollup of 3 pull requests #112530

matthiaskrgr · 2023-06-11T16:38:29Z

Successful merges:

Update documentation for tools defaults #112487 (Update documentation for tools defaults)
Dont compute opt_suggest_box_span span for TAIT #112513 (Dont compute opt_suggest_box_span span for TAIT)
bootstrap: Don't override debuginfo-level = 1 to mean line-tables-only #112528 (bootstrap: Don't override debuginfo-level = 1 to mean line-tables-only)

r? @ghost
@rustbot modify labels: rollup

Make the build process more beginner friendly: - Include information explaining that the stage2 toolchain should be used (and not the stage1 toolchain) due to the `download-rustc` setting. - Display a message when the user runs `x setup tools` explaining that they should use the stage2 toolchain.

This has real differences in the effective debuginfo: in particular, it omits the module-level information and breaks perf. Allow passing `line-tables-only` directly in config.toml instead.

…ulacrum Update documentation for `tools` defaults This PR alters the information in the tools profile config to mention that `download-rustc` uses the stage2 toolchain and not the stage1 toolchain (see https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/Unable.20to.20compile.20rustc.20MSVC and rust-lang/rustc-dev-guide#1694).

…pan-for-tait, r=cjgillot Dont compute `opt_suggest_box_span` span for TAIT Fixes rust-lang#112434 Also a couple more commits on top, pruning some dead code and fixing another weird suggestion encountered in the above issue.

…-Simulacrum bootstrap: Don't override `debuginfo-level = 1` to mean `line-tables-only` This has real differences in the effective debuginfo: in particular, it omits the module-level information and makes perf less useful (it can't distinguish "self" from "child" time anymore). Allow passing `line-tables-only` directly in config.toml instead. See https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/debuginfo.20in.20try.20builds/near/365090631 and https://rust-lang.zulipchat.com/#narrow/stream/238009-t-compiler.2Fmeetings/topic/.5Bsteering.5D.202023-06-09/near/364883519 for more discussion. This effectively reverts the cargo half of rust-lang#110221 to avoid regressing rust-lang#60020 again in 1.72.

matthiaskrgr · 2023-06-11T16:39:08Z

@bors r+ rollup=never p=3

bors · 2023-06-11T16:39:10Z

📌 Commit c1f2da5 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-06-11T17:33:55Z

⌛ Testing commit c1f2da5 with merge 37998ab...

bors · 2023-06-11T20:04:35Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 37998ab to master...

rust-timer · 2023-06-11T20:05:29Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#112528	9959cdf35accd1b07fb2ac74635e10de483ec3a4
#112513	74b2d61c04d5d803c7fcc28a1cfc52fc8b5a2d46
#112487	d5db223c793e96736abaf8900a944fef307160e5

previous master: 81c02da94e

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-06-11T22:50:29Z

Finished benchmarking commit (37998ab): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	9.3%	[0.6%, 21.0%]	19
Regressions ❌ (secondary)	8.7%	[1.0%, 20.8%]	71
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	9.3%	[0.6%, 21.0%]	19

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.2%	[1.2%, 1.2%]	1
Regressions ❌ (secondary)	2.9%	[2.0%, 3.7%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[1.2%, 1.2%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	8.6%	[0.8%, 15.4%]	14
Regressions ❌ (secondary)	8.1%	[1.6%, 15.1%]	52
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	8.6%	[0.8%, 15.4%]	14

Binary size

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	27.8%	[2.7%, 55.3%]	24
Regressions ❌ (secondary)	52.8%	[36.7%, 55.4%]	74
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	27.8%	[2.7%, 55.3%]	24

Bootstrap: 647.238s -> 650.784s (0.55%)

Kobzol · 2023-06-12T07:08:38Z

@rust-timer build 9959cdf35accd1b07fb2ac74635e10de483ec3a4

lqd · 2023-06-12T07:12:49Z

It's likely to be the #112528 partial revert indeed, as the initial PR had unexpected wins by seeping through libstd IIRC #110221 (comment)

rust-timer · 2023-06-12T09:14:19Z

Finished benchmarking commit (9959cdf35accd1b07fb2ac74635e10de483ec3a4): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	9.4%	[0.5%, 21.2%]	19
Regressions ❌ (secondary)	8.8%	[0.9%, 21.0%]	70
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	9.4%	[0.5%, 21.2%]	19

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.2%	[1.2%, 1.2%]	1
Regressions ❌ (secondary)	3.0%	[2.5%, 3.5%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.3%	[-2.3%, -2.3%]	1
All ❌✅ (primary)	1.2%	[1.2%, 1.2%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	9.7%	[0.7%, 15.5%]	12
Regressions ❌ (secondary)	8.3%	[2.0%, 15.0%]	48
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	9.7%	[0.7%, 15.5%]	12

Binary size

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	27.8%	[2.7%, 55.4%]	24
Regressions ❌ (secondary)	52.9%	[36.8%, 55.5%]	74
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	27.8%	[2.7%, 55.4%]	24

Bootstrap: 647.238s -> 647.582s (0.05%)

pnkfelix · 2023-06-13T20:14:34Z

One of the rolled up PRs, PR bootstrap: Don't override debuginfo-level = 1 to mean line-tables-only #112528, is itself a partial revert of PR Greatly decrease the size of rustc_driver.so when debuginfo is enabled #110221, which yields the large compile-time losses noted here (solely for helloworld, it is worth noting).
the point is, the gains were 1. accidental 2. isolated to a toy and 3. due to an unintended change (which was now reverted).
marking as triaged.

@rustbot label: +perf-regression-triaged

zwhiteley and others added 8 commits June 10, 2023 19:08

Don't compute opt_suggest_box_span for TAIT

e49b462

prune some unused code

5dfc17f

Don't suggest boxing an empty if/else arm

d804402

Don't override debuginfo-level = 1 to mean line-tables-only

1236939

This has real differences in the effective debuginfo: in particular, it omits the module-level information and breaks perf. Allow passing `line-tables-only` directly in config.toml instead.

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 11, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 11, 2023

bors merged commit 37998ab into rust-lang:master Jun 11, 2023

rustbot added this to the 1.72.0 milestone Jun 11, 2023

bors mentioned this pull request Jun 11, 2023

Add support for targets without unwinding in mir-opt, and improve --bless for it #112418

Merged

rustbot added the perf-regression Performance regression. label Jun 11, 2023

This comment has been minimized.

Sign in to view

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 13, 2023

matthiaskrgr deleted the rollup-qee1kc1 branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 3 pull requests #112530

Rollup of 3 pull requests #112530

Uh oh!

matthiaskrgr commented Jun 11, 2023

Uh oh!

matthiaskrgr commented Jun 11, 2023

Uh oh!

bors commented Jun 11, 2023

Uh oh!

bors commented Jun 11, 2023

Uh oh!

bors commented Jun 11, 2023

Uh oh!

rust-timer commented Jun 11, 2023

Uh oh!

rust-timer commented Jun 11, 2023

Uh oh!

Kobzol commented Jun 12, 2023 •

edited

Loading

Uh oh!

This comment has been minimized.

lqd commented Jun 12, 2023

Uh oh!

rust-timer commented Jun 12, 2023

Uh oh!

pnkfelix commented Jun 13, 2023

Uh oh!

Uh oh!

Rollup of 3 pull requests #112530

Rollup of 3 pull requests #112530

Uh oh!

Conversation

matthiaskrgr commented Jun 11, 2023

Uh oh!

matthiaskrgr commented Jun 11, 2023

Uh oh!

bors commented Jun 11, 2023

Uh oh!

bors commented Jun 11, 2023

Uh oh!

bors commented Jun 11, 2023

Uh oh!

rust-timer commented Jun 11, 2023

Uh oh!

rust-timer commented Jun 11, 2023

Overall result: ❌ regressions - ACTION NEEDED

Uh oh!

Kobzol commented Jun 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

lqd commented Jun 12, 2023

Uh oh!

rust-timer commented Jun 12, 2023

Overall result: ❌ regressions - ACTION NEEDED

Uh oh!

pnkfelix commented Jun 13, 2023

Uh oh!

Uh oh!

Kobzol commented Jun 12, 2023 •

edited

Loading